Don't generate st.h in a subdir

For srcdir != builddir, in the builddir, the st/ subdirectory doesn't
exist, so we can't generate st.h there. Just switch to building st.h
directly in the current directory. (The other option would be to
create a st/ subdirectory in the builddir if necessary; might be a
little cleaner, but this works for now and gets things distchecking.)

diff --git a/.gitignore b/.gitignore
index 9cbae4b7f65d0e52c52d05b7cc16d1036bb80192..527a7361d5bc9985e44998e16e68cbaddaddc77b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ src/gnome-shell
 src/test-recorder
 src/test-recorder.ogg
 src/test-theme
-src/st/st.h
+src/st.h
 stamp-h1
 tests/run-test.sh
 xmldocs.make

diff --git a/src/Makefile-st.am b/src/Makefile-st.am
index 2e6ea136b7d3a552fde1e4535ed77057347d9294..51593e24075aed159ca2d66b4fc5aa9e9b9fd45d 100644 (file)
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@@ -97,14 +97,14 @@ st_source_h =                                       \
     st/st-types.h                              \
     st/st-widget.h                             \
     $(NULL)
-    
-st/st.h: Makefile
+
+st.h: Makefile
        $(AM_V_GEN) (echo "#define ST_H_INSIDE 1";      \
        for name in $(st_source_h); do                  \
          echo "#include <"$$name">";                   \
-       done; echo "#undef ST_H_INSIDE") > st/st.h.tmp && mv st/st.h.tmp st/st.h
+       done; echo "#undef ST_H_INSIDE") > st.h.tmp && mv st.h.tmp st.h
 
-BUILT_SOURCES += st/st.h
+BUILT_SOURCES += st.h
 
 st_source_private_h =                          \
     st/st-private.h                            \
@@ -152,7 +152,7 @@ libst_1_0_la_SOURCES =                              \
     $(st_source_private_h)                     \
     $(st_source_private_c)                     \
     $(st_source_h)                             \
-    st/st.h                                    \
+    st.h                                       \
     $(st_built_sources)                                \
     $(NULL)
 libst_1_0_la_CPPFLAGS = $(st_cflags)

diff --git a/src/shell-slicer.h b/src/shell-slicer.h
index 29c44bb199c213637055f6fc0cc16d783b9e7326..1276ca252bd55a42113932a0717050a4b59870d4 100644 (file)
--- a/src/shell-slicer.h
+++ b/src/shell-slicer.h
@@ -2,7 +2,7 @@
 #ifndef __SHELL_SLICER_H__
 #define __SHELL_SLICER_H__
 
-#include "st/st.h"
+#include "st.h"
 
 #define SHELL_TYPE_SLICER                 (shell_slicer_get_type ())
 #define SHELL_SLICER(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_SLICER, ShellSlicer))